Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Tue, 15 Nov 2005 14:44:37 +0000 (15:44 +0100)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Tue, 15 Nov 2005 14:44:37 +0000 (15:44 +0100)
commit5a408169e4a2a2e47e399a4fbec300f7e6aea482
treef711593307877b9266b2d4768bbc5af606de2d88
parent0e9ceb580a22ec9f3677e2f4859378cb5a6efd82
parent597a25c0f47b24f9f03d2feef206348ae1ab8c50
Merged.